bitkeeper revision 1.1389.19.2 (428321b5bcT5YAmWdW7tRiZwz5gF8A)

Fix read-only mappings in blkback driver.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
index 2554f999d76b85d6bc6b69430e85c56dd70988ad..7101103a89c8b3cedf1db5b65470798143088062 100644 (file)
--- a/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
+++ b/linux-2.6.11-xen-sparse/drivers/xen/blkback/blkback.c
@@ -486,12 +486,11 @@ static void dispatch_rw_block_io(blkif_t *blkif, blkif_request_t *req)
         preq.nr_sects += seg[i].nsec;
 
         aop[i].u.map_grant_ref.host_virt_addr = MMAP_VADDR(pending_idx, i);
-
         aop[i].u.map_grant_ref.dom = blkif->domid;
         aop[i].u.map_grant_ref.ref = blkif_gref_from_fas(fas);
-        aop[i].u.map_grant_ref.flags = ( GNTMAP_host_map   |
-                                       ( ( operation == READ ) ?
-                                             0 : GNTMAP_readonly ) );
+        aop[i].u.map_grant_ref.flags = GNTMAP_host_map;
+        if ( operation == READ )
+            aop[i].u.map_grant_ref.flags |= GNTMAP_readonly;
     }
 
     if ( unlikely(HYPERVISOR_grant_table_op(